Merge "Add tests that exercise MouriMap in RenderEngineTest" into main