Merge "Fix broken Quick Access Wallet CTS test"