Merge "Remove FramePop trace listener if no outstanding events"