Merge "Fixed Sound Settings summary text" into nyc-mr1-dev