<Android> Fix shuffle problem