* Partially revert "Move library page EmptyScreens into list/grids"
This partially reverts commit 376bbeb724.
* Properly fix issue 8720
* Partially revert "Move library page EmptyScreens into list/grids"
This partially reverts commit 376bbeb724.
* Properly fix issue 8720