Merge "Add state machine model for skipping initial brightness ramps." into oc-dev