Merge "Merge "SurfaceView: Clean up deferred-destroy-surface from UI thread" into rvc-dev am: 9464091e am: f1102c8c" into rvc-d1-dev-plus-aosp