Merge "Turn fading edges back on for ScrollView and HorizontalScrollView." into honeycomb-mr2