Merge "Improve jank monitor debug overlay" into main