Merge pull request #12868 from mattwire/updatesubscription_datepicker