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