Merge "6-2/ Integrate AppPairs flicker rotation tests"