Merge "Don't call surface.remove if surface is null." into oc-mr1-dev am: 1b08a4a8a3
am: 5bee11f577

Change-Id: Ie3f01cf1a7409f82bf13e4d10199e386109d994e