Merge "When display is frozen prefer preserving orientation." into nyc-mr1-dev