Merge "Defer creating QuickAccessServiceInfo in QuickAccessWalletClient" into main