Merge changes Id6e00fac,I653584d5 into udc-qpr-dev

* changes:
  fix(status bar): wifi and mobile icons flickering in large font/display size
  fix(non linear font scaling): clock & battery textviews might be cutoff in status bar when larger font size