Merge "Add colorControlActivated color to the seekbar theme"