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

Change-Id: Iecd7e41a38b449ac4711633a56220306f5fc1a57