Merge "Default gradient should be the dark version" into oc-dr1-dev