Merge "Send correct UID on perm flag update"