Merge "Use PersistedTaskSnapshotData to calculate TaskView size" into sc-dev