Merge "Fixes graybar as status bar and unshifts header view." into nyc-dev