Merge "Protect VPN dialogs against overlay." into qt-dev
am: e02360b53a

Change-Id: Ic4836367e0664c9dd0c8b1a35260b1332060674f