Merge "Fix crash in "Tree::updateBitmapCache""