Merge "Camera: Centralize owners, try two"