Merge "Fix frequent resetting to initialScale in non-useWideViewport mode." into klp-dev