Merge "Use a static getter to fetch the preferred payment setting" into main