Merge "If the menu hasn't been created yet don't do things with it am: 104be2e0 am: ef9a1620" into oc-dr1-dev-plus-aosp