Merge "Disable seamless rotation on flicker tests"