Merge "fix(statusbar): notification icons become too small when smaller font size" into udc-qpr-dev