Allow adjusting progress on touch events.

Change-Id: Ide0a7ae057a62f3631a32eeaa63f3e04dec5bf54
Merge remote-tracking branch 'upstream/cm-12.0' into cm-12.0