Merge "Transforming notifications now based on the user dragging" into nyc-dev