Merge pull request #30701 from ejaazkhan/shift-type-null-in-employee-checkin