Merge "Fix ClassCastException in logging bridge stop"