Merge "Move UID update code to location thread to prevent ANRs."