Merge "Don’t reset the menu state if the menu is showing during an update" into oc-dev