Merge changes Iecd1303f,I2076c500 into lmp-mr1-dev

* changes:
  Fix NPE in FlashlightController
  Fix stale unlock icon