Merge "Tune display options for non-default display sizes" into tm-qpr-dev