Merge "Camera: Avoid caching extension service connections" into udc-qpr-dev