Merge "Add ViewConfiguration.getScaledScrollFactor()"