Merge "Create our own background thread for uidmap"