[#924521] Better buffering handling while playing