Merge "Fix date picker dialog size"