[Backport queued_ltr_backports] Fix a few more places we try to load crs as a layer

[Backport queued_ltr_backports] Fix a few more places we try to load crs as a layer #7635