Merge "Slight adjustments to gradient shown when dragging to dismiss" into oc-dev am: 1eeeba6af6
am: ab1a61952f

Change-Id: If0afd973763dee805be2f63a571d79adba9ecd1b