Merge "fs_mgr: Small fix in overlayfs setup/teardown"