Merge "Remove/destroy status bar window view when display is removed" into main