Fix rendering mode switching issue in old & new UI