Some code cleanup and some testing trying to get the media control events when they are sent from the watch.