Create new ones as we get new screens, clean them up as the screens are removed. (cherry picked from commit 8e8c16b8)