Try to make the cancel editing confirmation dialog less confusing

Bug 26615850
Bug 26594357

Change-Id: I651e9a056227a7149051c3f9bb55b26d24cd7fad
2 files changed