Merge "Revert^2 "Allow system e2fsck to run in early init."" into main