Merge "Merge "Fix issue with fontScale changes not taking effect" into oc-dev am: 83c9413b75" into oc-dev-plus-aosp