Merge "Fix the case where blocked reasons for dataSaver are not considered." into sc-dev