Merge "[pm] fix non-incremental install progress regression" into sc-dev