[1st Attempt] Fix route components remounting rather than being updated when props change

[1st Attempt] Fix route components remounting rather than being updated when props change #1042