Merge "Fix harmless unsigned overflow in recoverPTS"