Merge "init: call umount unconditionally"