Merge "Use 'dp' paddings instead of 'mm' for VPN dialogs" into mnc-dev