Merge "Per-app compat treatment for overrideToPortrait." into tm-qpr-dev