Merge "Re-Add VPN-"Settings" button to QSFooter dialog" into nyc-mr2-dev