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

Change-Id: I68feaf8262bb23db08199bff874fc871cff1acfb