Merge "Fix ScrollerCompat tests."