Merge "[DO NOT MERGE] Revert "Temporary flag for Launcher to debug their usage of sandboxed display APIs"" into sc-v2-dev