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

Change-Id: Ifd359db3b63eb0b4f8f8ee83276d3773427be73e