Allow arbitrary function for okay button, fix to resumeTour:

* Correctly handle default step in resumeTour.

Change-Id: I59add6878b10a111c19efab57562634116bec182
Make shouldSkip functions for common actions (edit and submit).

Change-Id: I32278c4e6d36376e3909aa4c9d20c68933eb1126
Merge changes I32278c4e,I59add687

* changes:
  Make shouldSkip functions for common actions (edit and submit).
  Allow arbitrary function for okay button, fix to resumeTour: