Merge proposals dependent on lp://qastaging/~cjcurran/indicator-sound/fix-collision-detection

1. fix-collision-detection
2. Dependent merge proposals