Merge "Prevent VPN being preloaded and activated without user's awareness" into lmp-mr1-dev