Bug 998000 - Part 0: cancelEdit on back pressed, rather than stopEdit. r=lucasr
Bug 998000 - Part 1: Fix whitespace. r=lucasr