Trebuchet : Fix edit dialog persistence

Change-Id: If3f09bbd08ecc67706cd1eec7083055bbae89c11
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2
Merge remote-tracking branch 'sgt7/cm-10.2' into cm-10.2-sgt7