Merge "AudioRecord: Clean up state handling"