Added Android popstate bug handling