Merge "Make default brightness ramp rates multiples of 60." into oc-mr1-dev