Merge "Clipping the last notification if it's in the shelf" into oc-dr1-dev am: 2ed613ca80
am: 8b1a5af473

Change-Id: Ic902c6e9c05046bf5b02dc7ab23b943730fce7d7