Merge "Add single provider and single account screens" into main