Merge "Add timeout to AbstractLauncherUiTest.getOnUiThread" into sc-v2-dev