Hammer merge 9897c4b30d87243e7af06f11dc74b1f2eae48f0a

Add screen to the build.