Fix Android back button behavior
Merge pull request #2789 from flyingdevelopmentstudio/FixAndroidBackButtonBehavior

Fix Android back button behavior