Merge "Added proper overscrolling scroll bar behavior to GridView"