Merge "Fix infrequent comment in LayerHistoryTest" into main