Merge "Fix negative inactiveTime on creating a new user" into mnc-dev