Merge "Allow advanced VPN to manage connection status via its UI" into tm-qpr-dev