Merge "Get fresh InProgress array in AttributedAppOp when adding/removing" into sc-dev