NXP-12001:  Fix toggled layout when using an expression depending on current mode