Merge "Add logic to redirect default payment setting to default wallet selector." into main