Merge branch 'zacs-master'
Set the 'Now Playing' text to hide when we're not.