Merge "Prevent ANR when AudioTrack is paused or re-routed"