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

Change-Id: I0886007c4f60821b87bff68b30654302a6e603c7