Merge "Stop listening for WiFi interface status changes" into nyc-mr1-dev