Merge "Guard render metrics against too-large render times" into main