Merge "Improved the logic for notification clipping"