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

Change-Id: I4f3702ce2159d415c0a71982024a7a07befe4798