Merge "audio: Specify frame counter behavior for streams"