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

Change-Id: Ieab24986bbf88d8e7c8f3f87e85a60745317afee
2017-05-05 16:12:53 +00:00
..
2017-05-04 17:53:11 -07:00