Merge "Create new WifiEntryPreference if WifiEntry object changes" into rvc-dev