Merge "Made the dismissal of notifications snappier" into nyc-dev