Merge "WindowManager: Move mGlobalScale application to WindowState"