Prevent race condition in Router

This defends against deleting the wrong view from the Router's activeViews when we have a newer view with the same template name.  It closes #1657.