Merge "Allow all ActivatableNotificationRows to clip properly when interacting with the shelf." into qt-dev
am: b7a1ea9a3a

Change-Id: I7986e1033a2d0d208e0b647dd290927b7a7c7f41