Merge "Show lock message in Global Actions" into rvc-dev