fix #23011: change channel broken

Two separate bugs here.  First caused staff text channel changes to be applied at the wrong time.  Second prevented channel changes to "normal" from working at all.  My fix to this should also result in "normal" being translated in the staff text properties where previously, I'm betting it wasn't in cases where there was no explicit channel tag in the instrument definition.