Merge "Enable VPN settings for secondary users" into mnc-dev