Registered on layout only if current state
Registered on layout only if current state

Added navigation listener so it registers after navigation if current
state. That handles the missed layout scenario

grahammendick/navigation,grahammendick/navigation,grahammendick/navigation,grahammendick/navigation,grahammendick/navigation,grahammendick/navigation,grahammendick/navigation