Merge "[pm] ignore partial progress update after off-incfs migration" into sc-dev