Merge "Fix mismatched parameter of font scale change" into rvc-dev am: 5580360ba8 am: 2694d3ca71 am: 0d0f22372f am: 66317daea8 am: 346552835e

Change-Id: I846f7d31ea95b793bf2331313aeb5bca09bb4342