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

Change-Id: Ia1bce155a52b9e829460e1cd882a4b9596e7c747