Merge "Fix NPE when bubble being dragged out" into rvc-dev