At the moment, the Screens class is convoluted with ifdefs because of MockScreens. The goal of this change is to reduce the number of usages of the MockScreens class so it is possible to get rid of the ifdefs.