Merge "Camera: "getMaxSharedSurfaceCount" should be non-static"