Merge "Update info page to new UI"