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

Change-Id: I4a5a2ad36d792c5edd335e77c61c5fc0d5ec75d5