Merge "[pm] fix progress on commit for non-incremental apps" into sc-dev