Merge "[Wi-Fi] Fix SavedAccessPointsPreferenceController crash when editing Settings search box"