Merge "Make horizotnalscrollview and scrollview edgeglows match the new algorithm."