Merge "Add account picker to Support Tab"