Merge "Add new interaction jank hook point for cuj tests"