Merge "Optimized notification timestamp clearing"