Merge "Properly end lifetimeExtention for ongoing notifications"