Merge "Migrate Jank Interaction clock id source to new interactor" into main