Merge changes from topic "b150393918-lock-icon" into rvc-dev

* changes:
  Cache icon drawables.
  Remove injection from LockIcon.