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

Change-Id: Ibee9f786daefba0d8a38c80e7727f1d6a8ebec88