Merge "Fixed an issue where the lock icon could be invisible" into oc-dr1-dev