Merge "UserDataPreparer: reboot to recovery if preparing user storage fails" into snap-temp-L01900000954560285