Merge "Fix AppWindowTokenTests#testLandscapeSeascapeRotationByPolicy"