Merge "Refresh payment preference while resume"