Merge "Fixes notification swipe snapping when menu is empty."