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

Change-Id: Ide6ede97ae30fab4c53b1b2f405460384e24d6d1