Merge "Merge "Revert "fix(non linear font scaling): fix status bar ui broken...
Merge "Merge "Revert "fix(non linear font scaling): fix status bar ui broken when 200% font scaling"" into udc-dev am: b26d3a55 am: 92274308 am: 688eb17a" into udc-qpr-dev-plus-aosp