Merge "Add new config to tell us whether brightness is bucketed or continuous" into oc-dr1-dev