Improve support for multiple surfaces in demo

Change-Id: Ie462795d4259795ffb6a4514099470d1609beb34