Clean up code
Improve NavController.preparePage
Merge branch 'back-button' into development