Merge "Ignore blocked-on-sf time for ADPF" into sc-dev