Merge "Shuffle sound settings UI arrangment" into pi-dev
am: c22bada88a

Change-Id: I3f02057b6c7faa902a6832f4ac8dc878e67ac786