am 801d0b33: am 025822a0: Merge "keep a list of visible sorted surfaces" into gingerbread

Merge commit '801d0b33e845648866472263263a7001b528c3f4'

* commit '801d0b33e845648866472263263a7001b528c3f4':
  keep a list of visible sorted surfaces