Merge "Move enum class Screen (1/3)" into main