Merge "VPN: silence VPN notifications." into ics-mr1