Merge "Make new UI default."