Merge "Add fs_mgr support for dm-verity modes"