Merge "Make track informational event optional, depending on system property"