Merge "Fix: WalletContextualLocationsService issuing binder calls on main thread" into main