Show 'Next' button for action next and remove end tour checkbox.

Includes some refactoring and a Guiders submodule bump for determining
the exact close method.

Some line wrapping

Change-Id: I8306995a5432371a5907e1df03c652135fd2fc7d
Merge "Show 'Next' button for action next and remove end tour checkbox."