Merge "Notifications: Fix bad layout for long texts" into nyc-mr2-dev