Merge "Fix failing LauncherIntentTest." into main