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

Change-Id: I570757d0d0d2daa312cc41e26f9b4a239af6e743