Merge "Make infused and non-infused DateInputWidget consistent"