Merge "use an observer for the default sound" into nyc-mr1-dev