Merge "Fixed an issue where the lock icon could be invisible" into oc-dr1-dev am: 106b5eefd2
am: 13186772e6

Change-Id: Ifd886830f5e5bb6a6e6c7e72419a88fc886b1a12