Merge "Fix NPE in registerLoadingProgressForIncrementalApps" into main