Merge "Added support for VPN Intent" into stable/beryllium