Merge "Fix GraphicsMapperStableCTests#LockUnlockNoCPUUsage" into main