Merge "Fix date picker color handling, expose StateSet utils in more places"