am 937b7ad9: am 7b554a8f: am 057d9397: Merge "Fix ScrollView\'s EdgeEffect to respect clipToPadding flag" into mnc-dev

* commit '937b7ad9f78ea10e001aca6ecbfbf0a15e0b7778':
  Fix ScrollView's EdgeEffect to respect clipToPadding flag