Merge "Add flicker test for quick switching back to app from launcher"