Merge "Add a branded VPN icon for quick settings and status bar." into nyc-mr1-dev