Merge "Fix announcement of global actions menu" into oc-dr1-dev