Merge "SF: fix displayDeadlineDeltas and displayPresentDeltas histogram" into sc-dev