Base: Fix transition to same page issues
Base: Fix transition to same page issues

OpenSprinkler/OpenSprinkler-App,PeteBa/OpenSprinkler-App,PeteBa/OpenSprinkler-App,OpenSprinkler/OpenSprinkler-App,PeteBa/OpenSprinkler-App,OpenSprinkler/OpenSprinkler-App