Fix for list builder toggle button after auto expand on edit/add entry  \r\n Ticket: GCP-8619  \r\n Reviewer: To be reviewed by Jai