Merge "Only call -rerouted callback if displayId changed"