Merge "Show wallet option in picker even if not set up." into tm-qpr-dev