Merge "Fix for MediaPlayerTest#testGapless"