Merge "UserDataPreparer: reboot to recovery if preparing user storage fails"