Merge "Make the notification windowshade work properly with overscroll."