A variety of changes to improve (but not entirely fix) behaviour

A variety of changes to improve (but not entirely fix) behaviour
when moving content (or otherwise changing the playlist) while playing.

This commit refills the butler when things change in certain ways,
and improves locking to cope with Player methods being called from
the GUI and butler threads at the same time.