Fixed the conflicts when merge to generic-user-popup.