Merge "Don't let exiting starting window control system bars" into main