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

Change-Id: Ibb62d63ab18f2d200b4eacd66c260eab7cad0184