Merge "Consider mScrollX when drawing the checkMarkDrawable"