Merge "[CTS] LauncherApps lockdown fix" into pi-dev