Merge "Fix issue with fontScale changes not taking effect" into oc-dev