Merge "Send client / device format in recording callback" into nyc-dev