delay resetting the restart in progress flag
Fix blank right panes on boot when old UI prefs are present
Merge remote-tracking branch: upstream/master