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

Change-Id: I12a4cffa4f4e676712f131d5e4cc30861f614f29