Merge "Fix ScrollView's EdgeEffect to respect clipToPadding flag" into mnc-dev