Merge "TEST_MAPPING: re-enable fixed scheduler test" into main