Merge "Hide lockdown VPN when IMS auth is required." into jb-mr1-dev