Merge "UserDataPreparer: fix volume preparation order"