Merge "Do not use stableDisplaySize for scale factor" into tm-qpr-dev