Do not wire onLocationChange and onStateChange + comments related to issue 7364