Tweak music switcher and add additional logging.