Merge "VpnDialogs: revise UI layout."