Merge "Revert "Temporary flag for Launcher to debug their usage of sandboxed display APIs"" into tm-dev