Clicking on pencil icon keeps adding new header form

Change-Id: Ic9d19d191b6bb00c5023fe976582b925d1262ed1
Merge "Clicking on pencil icon keeps adding new header form"