Merge "If the menu hasn't been created yet don't do things with it" into oc-dr1-dev
am: 214baa034a

Change-Id: Id0422df61723072291d37a6b19dc8bf783c8d2d8