Ensure current state in view for deep transitions

Cater for when the depth of the transitions means scrolling to bottom of
them hides the current state