Merge "Fix testLandscapeSeascapeRotationByApp failure"