Merge "Defer UID data removal until after reading is finished"