Merge "Adjust touch progress offset to account for changes to AbsSeekBar" into nyc-mr1-dev