Merge "Revert "fix(non linear font scaling): fix status bar ui broken when 200% font scaling"" into udc-dev