Merge "Make child window inherit the scale of parent" into sc-dev