(WIP) Studio library view - Do not merge, for internal review

Taking a second look at this, it seems this change is not necessary after all. I must have mis-diagnosed the issue initially. I have now reverted the change to this line.

So far, none of my changes break any unit tests or even acceptance tests :)