Merge "Merge "Ensure that we hide the menu without resizing when expanding." into oc-dev am: 20d2450d am: 2883162a"