Merge "Use flag to switch to the new UI." into main