Merge "Disable WiFi autojoin when user decides via "Stay connected?" dialog" into mnc-dev