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

* commit '4a915ab505b4a39dab9ab99020bcae57e90ff928':
  Fix NPE in FlashlightController
  Fix stale unlock icon