Merge "Fix sticky firstEventAfterDiscontinuity setting"