DDF-638 added ability to revert to previous state upon selecting cancel on any screen