Merge "Refactor fs_mgr_update_verity_state()"