Merge "Update FLAG_DIR_BLOCK_TREE to FLAG_DIR_BLOCKS_OPEN_DOCUMENT_TREE"