Merge "Use snapshotView references in TaskContainer when possible" into main