Merge "Don't show global actions if already handled" into rvc-dev am: 74b6caa2be

Change-Id: Iee941cf553fe5172d16fd5eee188032dc4149b6d