Merge "Sound panel doesn't match material next design for Android S" into sc-dev