Merge "Resolve cross account user icon validation." into main