Merge "Add Shared timeline jank classification listener (2/2)"