Merge "[Provider Model] Fix the overlap when changing the font/display size" into sc-v2-dev