Merge "keep a list of visible sorted surfaces" into gingerbread