Merge "Fix mismatched parameter of font scale change" into rvc-dev am: 5580360ba8 am: 2694d3ca71

Change-Id: Icd16a43c916b4c23746bf4018ff36a28d4a53804