Merge "Update flicker tests for new shell transition"