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

Change-Id: I10d404f2f5ea4388d4c5d31dce129902410279b4