Make sure surface control is really valid before giving it to client am: 7581cddf25 am: d3edf1e799
am: c3dd655b71

Change-Id: I78cf78f376d20db5d50ad0bd8d735287b414eaa4