Merge "Merge "fix(non linear font scaling)!: fix QS text being cut off when...
Merge "Merge "fix(non linear font scaling)!: fix QS text being cut off when 200% font scaling" into udc-dev am: 0acac4d3 am: 391b9210 am: 222b6ba3" into udc-qpr-dev-plus-aosp