Remove SortEventOriginator and replace it with a boolean (#13334)

Change-Id: I8a203c5e2f4bc9074ccf3cb4e7f347f17d89fe52