Merge "Shuffle sound settings UI arrangment" into pi-dev