Merge "DO NOT MERGE: Properly reflect device lock state in Global Action panel." into qt-qpr1-dev