Fixes collision and depth sorting on hub screen
Merge collision and depth sorting with other changes