Rerun. Backport of fixing vertical alignment on date picker icon