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

Change-Id: I697cb93ecf72a3f493ea7005e7d16a74902c2df8