Merge "QS Wallet priority placement" into sc-dev