Merge "Fix partial user cleanup on restart" into mnc-dev