fix #22637: align multimeasure rest and repeat measure correctly