Code review comment for lp:~ahayzen/music-app/toolbar-refactor

So far I haven't found anything that might cause a regression. However, should we target this for a separate 'refactor' series and merge back in to trunk as necessary?