am 42658ed5: am 30ad7203: Merge "Consider mScrollX when drawing the checkMarkDrawable"

* commit '42658ed5182a75b82dd2b970a1f97fc30407d1e3':
  Consider mScrollX when drawing the checkMarkDrawable