Merge "Handle naming for system uids running as secondary users"