music tiles & hybrid toggle fix

Change-Id: Id2c7264a21ffe3c1413d857fbe2f919237b2c3b6