Merge "Cherry-pick: Scale the layout width by the UA initial scale" into klp-dev