Merge "Adjust some of the timings around animating / showing the dismiss gradient" into oc-dev