Merge "AudioRecord: Use original flags during track recreation" into nyc-dev