Merge "Fix mismatched parameter of font scale change" into rvc-dev