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

Change-Id: I9f559c5c280eb2eb73b67899181a59733d06bc21