Merge "Dont reset the menu state if the menu is showing during an update" into oc-dev
am: 814d666f76

Change-Id: I0b31d86447dd53236f5e4253cea79ab47902c7fe