Merge "AudioTrack: fix music resume" into klp-dev