Add automatic next button step specification.

* Fixes first edit tours where there is either next or okay.
* Refactor getButtons a bit due to new option being added.

Change-Id: Idd9179bd05d86cd0426dc8eabebff306a339282e
Merge "Add automatic next button step specification."