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