Merge "Update surfacereplayer owners file"