Merge "Use CarUserManager and fix broken "add user" button" into rvc-qpr-dev