Merge "Make timestamps of notification related events a bit more accurate."