Merge "Clear up /data/misc_ce/user folder on delete and reboot"