Merge "Merge "Fixed an issue where the lock icon could be invisible" into oc-dr1-dev am: 106b5eef am: 13186772" into oc-mr1-dev-plus-aosp