am 288f65e3: Merge changes Iecd1303f,I2076c500 into lmp-mr1-dev

* commit '288f65e3811d17273085bc5c8b553f9ba8833dd4':
  Fix NPE in FlashlightController
  Fix stale unlock icon