Merge "Pass in event time when notifying listeners of a state change"