Merge "set-verity-state: Harden logic of overlayfs setup/teardown"