Merge "Fixed a crash when dragging down on the NotificationShelf" into sc-v2-dev