Merge "SurfaceView: Clean up deferred-destroy-surface from UI thread" into rvc-dev