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

Change-Id: I1f1962ddf3a98f84b48934f78402eae7f7e5e64b