Merge "Remove StateProvider from LockIcon" into rvc-dev