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

Change-Id: I00b748e113635b7019c175fc138902237c6e7e89