Merge "Improved the heads up logic to launch fullscreen intents less" into nyc-dev