Migrate music app to use marionette By

Part of issue #1175

master -> Merge.
v1-train -> Merge.