Bug 936385: Re-layout Music2 UI