Integration with repeat & shuffle
<Android> Fix shuffle problem