Merge "Remove the local insets sources if the owner dies" into udc-qpr-dev