Merge "MediaControlView2: Add Music UX" into pi-dev
am: 04ba822e09

Change-Id: I08b1cf23140712ed39c1186a36ab10b635f00f37