Merge "Speed up network transition when WiFi disconnects" into mnc-dev