Merge changes Ie0a7ec38,I5199dc85

* changes:
  Handle messages in standby for DeviceDiscoveryAction
  Prevent periodic actions from starting twice