When editing captcha is visible, editing window is now properly hidden.

When editing captcha is visible, cancel button now returns user to the
editing interface rather than canceling out of the edit entirely.

Change-Id: I1e11da4d6d9b6ad2f08d32a854af8c9321f880a0