Don't change the button html if we aren't showing them
Change hideSkip option to hideSkipDone as both buttons are hidden by it
Merge branch 'hide-navigation' into develop