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

Change-Id: I339e81ce302b2f9ad8b5c09d4b95a4a4d9864045