Merge "Move NTP updates outside locks"