Merge "Don't block the boot on hashing sepolicy" into main