Merge "FaceManager removal callback should propagate remaining"