Merge "Updated day_picker Bug: 5076695"