Merge "Make WindowState mUnderStatusBar reflect position."