Merge "Add flicker test for quick switching forward between two apps"