Merge "VpnDialogs: change paddings."