Move channel monitor updates inside the channel_state lock