Merge "Show lock message in Global Actions" into rvc-dev am: 315edf11f8

Change-Id: If79ec8a9f8bf11f2283e34d9606b1e21b6a5bb60