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