Merge "Add flag for contextual wallet suggestions" into tm-qpr-dev