Avoid double-parse on edit regression due to content handler

Change-Id: Iba40d8d7cb5700580e504a9b1b8359e4a62fb8cf
Merge "Avoid double-parse on edit regression due to content handler"