Merge "Lock input and output sample rates" into nyc-dev