Merge "Remove logic that blocks surface update of system organized TF" into main