Scroll for all steps in tour; add dependency for consistency

Change-Id: Ib84f531a23c6ace886d6d0489514e0a09c198012
Merge "Scroll for all steps in tour; add dependency for consistency"