Merge "Move VpnDialogs into core.mk."