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

Change-Id: I489d7317bb2672fcc96ff69ec8c63e0911f75bf7