Merge "Fix volume slider color is not correct" am: d1489d2f1f am: 9bb1c631ae

Change-Id: I66e7bb3c06891d092d6ec4b49372ab977670beee