Merge "Remove most sounds" into pi-dev