Merge "Add/remove routing change listener support"