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

Change-Id: I2611bb4cff57d1d0b8bf8116bb9bfadc6cc20af4