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

Change-Id: I308e580aeadeafd3d694b9e0d38ba25d62170ef4