Merge "Fix a mismerge by removing duplicated flag for improved wallet role icon" into main