Set editMode explicitly to false for clarity

Change-Id: I0b6ca7b1e041c7e3bf43784002e0d4ec7730b362
Merge "Set editMode explicitly to false for clarity"