Merge "Don't inset status bar." into main