Merge "Make default implementation of fillWindow typesafe. Bug: 5218310"