Merge "Fix crash resulting from missing entry in the taskViewIdArray" into main