Move InFlightHtlcs into ChannelManager