Merge "ScreenCaptureListenerWrapper - hold weak ref" into udc-dev