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

Change-Id: Ie9b901cdfbccca6b6497b5e6f490cd734251660e