Merge "Update wallet setting availability" into tm-qpr-dev