Fixes to make transitions and screens work together.

This currently only works for sl1 screens, as sl2 screens are
over-agressively reusing displayables.