Merge "Use correct constants for Global Actions Panel settings." into qt-dev am: 7627363d3e
am: 6d740fdb4c

Change-Id: Ic69db8e14a4f2f5433688aa586fd813bb7f3a0dd