Merge "Notification: Fix bug with sliding action list" into nyc-dev