Merge "Make display brightness ramp rate fast configurable" into nyc-dev