Cherry picking js-routes fix and regenerating routes on content_views