Merge "Clipping the last notification if it's in the shelf" into oc-dr1-dev am: 2ed613ca am: 0d7ff532 am: ae74e8d8 Change-Id: Ia9842fb548e60f7406b414b9b5321c734b7e4a66