Merge "Don't scale iconSize and textSize in non-default display size" into tm-qpr-dev