Merge "Color of the ring around the lock icon" into oc-dr1-dev