Merge "WM: Split portrait and landscape status bar size"