WoS will never go non-custodial/self-custody. Their entire business model is to be a custodial wallet.