Merge "Change ConsumerBase's FrameAvailableListener to be a weak pointer"