Fix Navigation logic in AnnotationView

[himanshunaidu]

Instead of creating a new ContentView instance every time we need to go back to it, we now pop the current AnnotationView from the navigation stack to return to the ContentView.