Merge "Re-Add VPN-"Settings" button to QSFooter dialog" into nyc-mr2-dev am: a7c6324340
am: 418f072a0e

Change-Id: I0c765230dbcc82b05a488ad2f5e66cf20ef90551