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

Change-Id: Ie8ef3f708212674d7d997ca8fea7a6d416eb64b3