Merge "Detach ViewCaptureRule onDrawListener on the main thread." into udc-dev