Merge "Nuke WindowState#mShownPosition. Rework mXOffset/mYOffset."