Merge "Add support for dynamic shared output surfaces"