Merge "Fix AudioTrack cannot resume after underrun" into sc-dev