Merge "Change allowed sound triggers to 1000" into pi-dev