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

Change-Id: I0bab81ee4baa0e08a1c1a6418135199b74d5f0d4