Merge "Replace profile locked notification icon" into rvc-dev