Try to make the cancel editing confirmation dialog less confusing am: d1cc5fe91e
am: 53a3d13f62

* commit '53a3d13f62e935840e0d56e1532a92deaabb2cbb':
  Try to make the cancel editing confirmation dialog less confusing