Merge changes I6abbfc5d,I1ce1b014

* changes:
  Fix Wi-Fi DPP activity crash after configuration change.
  Implement Wi-Fi DPP flow