Merge "Avoid crashing system if the installed user doesn't existing" into main