Merge "Add merged local insets to proto" into udc-dev