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

Change-Id: Ia1847864ba71c80870e550c653f9c3cb1c91267c