Merge "init: delay 'user root' test to W+" into main