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

Change-Id: I0a30560842b0bd4f083c8fe9c04fb9696a658418