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

Change-Id: I39f56f3247cb44a2dd58f2fe47065e23e4f3827f