Merge "Fix Wi-Fi list adds same AP repeatedly" into oc-dr1-dev