Merge commit 'fa8904a683903524ed9749f296e80381e5820178' * commit 'fa8904a683903524ed9749f296e80381e5820178': Fix couple of issues in DatePicker
Merge commit 'fa8904a683903524ed9749f296e80381e5820178' * commit 'fa8904a683903524ed9749f296e80381e5820178': Fix couple of issues in DatePicker