Merge "Revert "[Status Bar] Set status bar window insets to the status bar height."" into udc-dev