Merge "Lock pattern should be red when error" into oc-dr1-dev