Merge "UserDataPreparer: only delete contents of user's system CE and DE dirs"