Merge "Fix a mistake of CameraAgentFactory's recycle();"