Refactored the code per Paul's recommendations. Extracted the TextWatcher to a seperate class. Changed the Cancel/Save button implementations.
Resolved merge conflicts