Fix play/pause update at music end
Merge branch 'master' into ui