Merge "Add support for manually set surround formats." into pi-dev