Merge "Merge "Fix announcement of global actions menu" into oc-dr1-dev am: 5d378e5f2a" into oc-dr1-dev-plus-aosp