Merge "Fixing NPE android.platform.test.scenario.launcher.overview testcases" into main