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

Change-Id: Id697948b665319b83b6becfa56a0148a13149ae3