Merge "Ensure that we hide the menu without resizing when expanding." into oc-dev