Merge "Simplify AudioTrack stream end and fix race" into klp-dev