am edb83227: Merge "Fix access point list jumping around in WifiSettings" into mnc-dev

* commit 'edb832271bc036975d9ff8cd1513b6a1e097f3cd':
  Fix access point list jumping around in WifiSettings