Merge changes I0d49fa29,I0acacd3f into lmp-mr1-dev

* changes:
  rework scan logic so as to make use of delayed messages instead of scan alarm
  reenable disabled config after a few minutes
tree: e67262728944e7a9f51be6e9e60e3284d88386b9
  1. service/