Merge "Include the display refresh rate in the jank data." into main