Merge "Add config to force display to transition to off after doze" into oc-dr1-dev