Merge "Waiting for Launcher activity to stop in OverviewTaskMenu.tapAppInfoMenuItem" into main