Merge "Fix unit test: set sysprop via injector" into main