Merge "Make sure surface control is really valid before giving it to client" into nyc-mr1-dev
am: f9f8e82045
Change-Id: I1d909be6bfa2f13dd05e170b87c11101525e6cf9
This commit is contained in:
am: f9f8e82045
Change-Id: I1d909be6bfa2f13dd05e170b87c11101525e6cf9