Merge "Fix always-on is not turned off when user forgets vpn" into nyc-mr1-dev