Merge "Updated overscroll assets" into honeycomb