am fc6a8bf2: Merge "Fixed a Wi-Fi dialog crash" into lmp-mr1-dev

* commit 'fc6a8bf2d729ad21fa8d7622f580401db351c269':
  Fixed a Wi-Fi dialog crash